From 59f6fc9bf6c47aa9b966c81ff8b2aebf14d4a493 Mon Sep 17 00:00:00 2001 From: Gert Wollny Date: Tue, 1 Dec 2015 04:37:11 +0100 Subject: [PATCH] Correct instances of libdcmtk4* --- debian/control | 2 +- debian/dcmtk-www.install | 2 -- debian/libdcmtk5.install | 2 +- debian/rules | 17 +++++++++++++---- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/debian/control b/debian/control index b7160b2a..fb53c1a0 100644 --- a/debian/control +++ b/debian/control @@ -129,4 +129,4 @@ Description: OFFIS DICOM toolkit library debugging symbols sending and receiving images over a network connection, as well as demonstrative image storage and worklist servers. . - This package contains the debugging symbols for libdcmtk4v5. + This package contains the debugging symbols for libdcmtk5. diff --git a/debian/dcmtk-www.install b/debian/dcmtk-www.install index 3bd6cba0..eff3c32b 100644 --- a/debian/dcmtk-www.install +++ b/debian/dcmtk-www.install @@ -1,5 +1,3 @@ -dcmwlm/images/* usr/share/dcmtk/www -dcmwlm/perl/* usr/lib/dcmtk/cgi-bin debian/apache.conf etc/dcmtk usr/bin/preplock usr/lib/dcmtk/cgi-bin usr/bin/readoviw usr/lib/dcmtk/cgi-bin diff --git a/debian/libdcmtk5.install b/debian/libdcmtk5.install index 61345946..542961ff 100644 --- a/debian/libdcmtk5.install +++ b/debian/libdcmtk5.install @@ -1,2 +1,2 @@ usr/lib/*.so.* -usr/share/libdcmtk4/*.dic +usr/share/libdcmtk5/*.dic diff --git a/debian/rules b/debian/rules index 051a00da..e67126f1 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,9 @@ export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed # needed for the tests -DEB_CONFIGURE_SCRIPT_ENV += DCMDICTPATH=dcmdata/data/dicom.dic +export DCMDICTPATH=$(CURDIR)/dcmdata/data/dicom.dic + + # deduce documentation option (build-indep target) ifeq "" "$(filter %-doc,$(shell dh_listpackages))" @@ -21,7 +23,7 @@ endif %: dh $@ --parallel --buildsystem=cmake -# -DDCMTK_INSTALL_DATDIR:STRING=libdcmtk4 +# -DDCMTK_INSTALL_DATDIR:STRING=libdcmtk5 # SKIP_RPATH=OFF to run test suite: # see #701231 @@ -36,7 +38,7 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \ -DDCMTK_WITH_ICONV:BOOL=ON \ -DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DDCMTK_INSTALL_DATDIC:STRING=share/libdcmtk4 \ + -DDCMTK_INSTALL_DATDIC:STRING=share/libdcmtk5 \ -DCMAKE_SKIP_RPATH:BOOL=OFF # -DCMAKE_INSTALL_PREFIX=/usr \ @@ -56,6 +58,13 @@ override_dh_auto_build-indep: # No tests needed for docs override_dh_auto_test-indep: + +override_dh_auto_test: + echo "DCMDICTDIR=$(DCMDICTPATH)" + dh_auto_test + echo "DCMDICTDIR=$(DCMDICTPATH)" + + override_dh_auto_install-arch: dh_auto_install # ?? @@ -87,7 +96,7 @@ override_dh_install-arch: mv ./debian/dcmtk/usr/bin/writwlst debian/dcmtk-www/usr/lib/dcmtk/cgi-bin/ override_dh_strip: - dh_strip --dbg-package=libdcmtk4v5-dbg + dh_strip --dbg-package=libdcmtk5-dbg get-orig-source: uscan --force-download --verbose --rename -- 2.30.2